Clean Up by Comment